fixup! remove global variable h