Merge pull request #384 from sanromd/ghost_cell_fix

Ghost cell fix