Attempt to fix bookmark issues