Should this perhaps be up in the else statement on line 230?