Fixed bug (I think)