Dialog Bug fix