Fixed hyper annoying bug