5.3 compatibility fix