Added workaround for non-track videos