Fixed #35 for good