Fixed null case