Fix for 1.3 compatibility issues