[PATCH 21.4] Fix custom saves