Bugfix: Buffer overrun;