closes Issue #1555