Fix the RequireCommand macro