Try to make build more stable