Fixed issue with annotation recursion