fix for customer context