Fixes regression with undefined context