fix - handle code