Fix for double annotations