closes Issue #1387