A fix for FEND-827