Fix custom streams