#57 - avoid buffer expansion