fix of issues with setup not being idempotent