finally fixed 17, that annoying bastard