fix newly introduced bugs