Mutable variant support
Fix off by one error