Fixed #34