Fix bug, planning