Fixed Video Loop, Better Handling