try to fix issue #13