It should. It will require change with another class which I didnt wanted to change. I will change and update PR.