Fancy workbench save fix