Bug fix: 0 value defaults