Fixed stop bug