Fixed line (603) & add -state