...
Fixed preliminary overlap problem