Added check for old orders