Adding code for Issue #470