Fix ModelBuilder