bug fix with null