FIXED MAJOR BUG!!!11