Closes issue #1448