Make fix to avoid random failures