Fix bug for Extended partations support