3.8.5 compatibility