Actually handle SPOT-1815