Trying to fix issue #7.