improve #17