Vishal #0 bug fix