behavior merge bugfix.