Improved after:save workaround