FIXED STUPID BUG