Closes Issue #1594