Minor focus fix - this whole thing needs sorting