Another fix for FEND-901