Fix issue with unit speed