@rcodina, my bad, I didn't test your patch, but as of now I have tested it, i...

@rcodina, my bad, I didn't test your patch, but as of now I have tested it, its applied successfully and working fine. And the patch I have added here is also working fine. Both of the above listed patches are working fine. Now, let's leave it on maintainers that which one will be applied.