Fix size calculations.
Release 2.1.1