Customer Module fix