Fixed dialog problems