fixed null product issue