Fix VideoService