0717 fixed errors