I have provided a patch, please verify if it is working or not.