#617 fixed