Fixed #157
...