Fix for mahjong_util and tests