security fix EDB-ID: 32831