working with upstream to improve #15