A fix for FEND-1077