Closes Issue #1338