Fixed issue with removing _x from stop numbers