Bugfix for empty length field