removed hack for tempest