adjustments to make stop work correctly