Temporary fix for WCM strange behavior