Removing duplicate code causing issue with parameter extraction