fix introduced bugs