closes issue #1530