Fix for issue  Issue #424

Changes to fix Issue #424