Updated to work with WPeC 3.8.11