SPEED-11 Fix: try another solution