Dialog Bug work around added