Bug fix - code complete