Fixed problem with loading annotations across sessions