changes focused on double method invocation when using anotations