Fix for before_save and default