Fix mass-assign issue