Partial fix for #379 (in Annotator). Waiting for site to update code before closing..