Fix issue on new interface with unit speed