Fixing flow in Builder generator use