Fixed bug I think