This commit might be performance critical, it has to be timed
carefully. Thus one can switch back to the old implementation.
The new one, however, is more safe and better to debug