Fixed dialog issue