Fixed #147 properly