[QE-1024] another fix attempt