4.4.0 compatibility fix