Fix customer bug