Issue3658 bugfix1

I have implemented the changes as required 
Hopefully everything is in place 
Looking forward to your review
Thank You