#1633 and 1634 bookmatch