improve checking in i() plus coverity stuff