#294 fixed