fix problem with setting defaults too aggressively