Fixing plugin and pre_save