fix for tempest bug