FIX TO THE MOST EPIC BUG EVER (HOPEFULLY)