Fixed #11, I hope