Fix for saving '0' as string