omg huge bug fix

please pull this fix, its a HUGE