Fixing security issue in bug #7.