Fixed #35
Fixed #34, again.