fix issue #236