issue #42 tune up