Added further WPML Compatibility