Simplify fix and remove exteranous rescues