Fixed MASSIVE BUG OMG