Fixed #167