fix for #626, added support for (default || defaultValue)