Spring compatibility fix