A fix for FEND-1295