FX-46: Fix