#1295 and #1294 bookmatch