https://github.com/ngocdaothanh/xitrum/pull/252