FINALLY FIXED THIS SUPER ANNOYING BUG!!!