fixed newly introduced bugs