Some fix into the new code