Fix ofd in mapper