Fixed #22 for real :)
Fixed #21