make auto-adjust more logical