fixed annotation mappings