fix issue #18