Fixed wrong cell mapping