Bug fix annotationfind