closes issue #630