Fix handling of accounting stop