Try to fix issue #86