tried to fix not stop bug