Fix broken customer spawning
Merge commit '6b62eb9'