Fixed behavior on empty stops