Fix #54 Fix #68 'after page'