Fixing for nonstreaming builders