dialog fixes 2.0