Fixed a HUGE bug