closes Issue #1388