try to make the code more robust (and use less memory)

try to make the code more robust (and use less memory) #1353