Similar fix regarding metric speeds.