bug fix merchants gateway