Fix dialog issue