Fixed EA code