diff --git a/CHANGELOG.md b/CHANGELOG.md
index e46e4d1fe4230b40e8c05939128ad4400dc7439f..f8636026c3a14c25ec5691f18b85d5d4b614783a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@
 
 Requires `libfranka` >= 0.5.0
 
+  * **BREAKING** Fixes for MoveIt, improving robot performance:
+    * Fixed joint velocity and acceleration limits in `joint_limits.yaml`
+    * Use desired joint state for move group
   * **BREAKING** Updated joint limits in URDF
   * **BREAKING** Fixed velocity, acceleration and jerk limits in `franka_hw`
   * **BREAKING** Start `franka_gripper_node` when giving `load_gripper:=true` to `franka_control.launch`
@@ -12,9 +15,7 @@ Requires `libfranka` >= 0.5.0
   * **BREAKING** Enabled limiting and low-pass filtering by default (`franka_control_node.yaml`)
   * Publish desired joint state in `/joint_state_desired`
   * Removed `effort_joint_trajectory_controller` from `default_controllers.yaml`
-  * **BREAKING** Fixes for MoveIt:
-    * Fixed joint velocity and acceleration limits in `joint_limits.yaml`
-    * Use desired joint state for move group
+  * Fixed a bug when switching between controllers using the same `libfranka` interface
 
 ## 0.5.0 - 2018-06-28