#767 fixed