Oops, fixed for avoiding errors and warnings. bugid:112462