Dialog fix attempt 1