FX-23: Fix issue