#74 fixed