Closes issue #1422