resolves SPOT-1720