Fixed EA-39617