fix issue #58