FIXED: dialog issues