got rid of the race condition for customers