CoachWhitaker's change to #16