fix(Builder): Handle off segments