Please DON'T FIX this at least until the next major update, i'm justing crying with this bug.