3.0 compatibility fix