Try to fix issue #1