yes, and works ok, thus TODO comment removed