in theory, this isn't needed any more