EAPI ordering fix