Fix variable option and honor max length