fixed newly introduced bugs :)