Retry at fixing the issue #78.