fix #411 - improve I and A