Modified sam321's video fix not to return an error code