fix issue #28