Fixed null isue