Fix OAI issue