Really fixed this time -- also it now doesn't repeat as much work

Change-Id: Icdb36999324338d3483720e027f50d42b260b0fc