#1 fixes in size counting