Fix one more potential bug