A fix for FEND-1216