Attempting to fix stop bug