Bug fix
Merge branch '4CellBugFix'