Fixes bookmark memoization