Fixed bug waiting to happen (I think)