fix staying bug