fixed null value handling