closes Issue #1317