Dialog HOT FIX