WC 2.2 compatibility