attempts to make build more stable (I suspect it's a timing issue)