security warning fix for 2.0