Fixing previous rebase with trunk