update issue #665 #599