FIXED : Last Field Bug