PROBABLY FIXED THAT DAMN BUG