Closed wpXtreme/wpx-CleanFix#27