try fixing SF::Annotated stuff