fixed nil call