(#1) Fixes "TypeError: Cannot read property size of undefined"