fixed nil data