porting #668 to 1.6.x
Merge pull request #675 from bukalapak/master

porting #668 to master branch