#43 fixed