Fixed AE2 integration