Fixed even more introduced bugs