Closes issue #1405