Credit @lalinsky for vidme improvement (#6812)