Fixing the new "NoMovie" option