Added an empty return fixer