fixed the video issue and made a safe callback