Fix keys ending in 's' not being saved