#619 fixed