Fixed #147