fix to previous - don't do it dynamically, do it on save