Reverted part of a previous optimization which lead to inconsistent data under certain circumstances.
Typo