Fixed null? bug