Fixes size issue related to issue #1445