fixed issue 9561