FINALLY FIXED OMG