ordering fix to switch order of lines 23 and 24