major fix yay