fixes task #147