fixed null case