wmc handling changed