Changed some more code lines so that the patch is minimal.