Evan's fix for bookmark