Closes Issue #1328