FX-27: fix bug