bc588d6 missed commit