Fixed bug on nulls