minor cleaning-up before fix issue #18