fix issue #24