Fix bug in "over 17 logic"