resolves SPOT-1559