Merge bugfix.