Fix an issue with spots not saving