EE Compatibility fix