Fix bug SPEED-14