Stream module fix