fix bug
Merge branch 'customers'