Phew.. but one bug remains