ensured consistent handling of defaults