Fixing regression introduced by yesterday change