Bugfix for tempest merged to stackforge