Made unfix mode smarter