annotation addon fixed - closes #365