Fix #62—Preserve constraints in legacy mode