Closes issue #1548