closes Issue #1335 also includes updated test case