major bug fix in setter patch