Version compatibility fix