Fixed critical bugs

Need test!