Fix values getting wiped #19

Closed stmiller-shamrock closed 3 years ago