Fix #535 and spore triggering.