Correction for the issue #7