Bugfix.
More robust.