Fix sorting issues with nulls
0.0.4