Bugfix.
Further bugfixes.