PIM-3367 : fix flush