Fixed on-device init bug