One more tiny fix when context is not available