bugfix and smaller stop offsets