fix: mass-assign error after recent changes
fix: Potential undefined method error
Merge branch 'master' into staging