This needs improvement I think - it should be checking all the annotations not the first one - I know this is based on my quick patch so really it is my bug :)