Add variable spacing between dynamics and bug-fix