Try to fix issue #8