Tempest configurator workarounds

fixed