#42 fixed