attempts to fix stop
merged