1.9.3 compatibility