Finished bugfix.