Fixed bug again :(