Small bugfix & removed malloc usage