Fix for not saving empty string values