#16 - Fix bug that ran index rebuild on every receive