Hack to get edit loop running smoothly.