Annotated bugfix 1