Fix the camel flow