Private bugfix for DFBOX-940