Redundant Return Check #69 Retesting and fixing