Fixed bug again