This fixes a nasty memory corruption bug, among other things.

Signed-off-by: Ben Greear <greearb@candelatech.com>