Fix one of two bugs