bugfix, idempotent condition, reboot safe