Fix the Streams and Resources controller