Fixed #157