Fix an issue with @Persist and Map not loading the Map correctly