fix two bugs at once