Trying to solve the buffer overflow problem.
Authored by: ivicaars 2012-11-14
Parent: [r27]
Child: [r29]