Fixed bug hopefully