Clean up.
Bugfix.