fix _off issues