A separated patch for the bugfix is better.