Workaround for invalid race in save