v3.1.6 compatibility issues