#47 fixed