6.8.3 compatibility