Fix factory for block assembly.