Made changes requested by [S2]Malloc