Fixing bugs with multi-cell model