Bug fix and bookmark link