Fix bug in build_spread use case