Big fix for customer book