#49 fixed