Fixed issue with contexts that don't use variables