#1574
Closes issue #1600