Fixed bug in the base WC