Added quick fix to prevent crash when playing videos from recent merge