bug fixing but still at least one bug remains