Make it work with new wcc installation