Weak hack to deal with missing context