Addressing Issue #531 and issue #1297