Final fix for video player