fixed issue #420