applied the same patch made on oim_weekly