Hack to work around deficiency in pass infrastructure