- fixed a bug with nulls