FX-17: fixed by Mr HiepHM