Not able to reproduce the error, But rerolled the patch with one more fix.