oath fix + migration + check