Should fix the null exception