Try to make build more reliable