Enter video function fix
Merge remote-tracking branch 'origin/master'
Enter/exit video()