FIXED DMITRY'S BUG