Fix for streaming services