Added also the forgotten code changes to the previous commit. :/