Fixed bug #43 (I think)