Workaround for WPE security and todos added.