Fixed a bug - we are using NULL as default value.