Hotfix for Delete and Edit a Stream