User inputs consistency fixed