fix issue #36