FIX THE MOST ANNOYING BUG EVER