Normal engine fix

No more restarts on key groups, streaming as usual