Further trying to fix stop numbers