Bug fix: NULL as default value