Partially corrected the issue #292
Partially corrected the issue #292