fixed nil cases