PR #894 (without BOOK implementation)