added support for nulls