(Hopefully) fixed bug