Possible fix for #60. Please test.
Bug fix regarding annotation controls.