Updated the return inspection

Fix #989.
But broke others.