fix issue #16