Fix @Override annotations set twice on overriden methods

This PR fix the bug identified in the comment on the code of the PR #982.