s: issue #12 small changes