Fixing the bookmark problem. DHH-437