as per CHEF-154 ticket