Closes issue #1574
Closes issue #1574