Revert to non-parallized spaghetti : there were a bug