Closes issue #1423