A fix for FEND-756