Fix the ContextIntent #43