Add an evil hack to fix impulses