Finally fix dialog?