now deal with possible bugs
still not solve minus bug